Index loop is in a seperate file now.
14 files changed