Adding Structure to the mess

Added some classes to bring structure into the mess that is in my head.
Got some plans. Again, an update mainly to sync code between my
computers.