refactiring rest of code base and adding checkpoints

continuing to simplify code so that it is easier to work with. Removing extras...