SOMETHING WORKS

^^^^^
In Class Additions

Some cleaning up and functionality changes with a bit more structure
added