Add new file, preliminary. (Holding space pre-refactor.)
Comment add for cleanup spots
Comments added
Fixing things...