Commit before altering lists

Doing major change for flexibility, changing a couple of things from
arrays to arraylists so want to backup incase I break something :)