starting to merge stuff
whatever
fixed index alloc delete
wired up the save
starting to merge stuff
Merge branch 'master' into chad_cleanup
starting to merge stuff