Moved old code I want to keep around into separate file
deleted some long-commented-out code
comments/formatting
Merge branch 'master' of github.com:mars0i/popco2