Adding new base for shared code for all
Moving things around, working on time stuff.