revert changes to before I completely screwed up the entire repository