I've made a ton of changes, need to commit