Build 4

Getting back into the swing of things. Crude classes are working and
cleaned up some team stuff.