Commit 30

Delicious list of objects replacing most arrays. Will need to sort out
scripts- probably a big job but definitely worth it.