I think I can do this
okay fixed that
moved stuff
added index layout