Checking in todays changes

Broke pretty much everything breaking out the class.  Need to fix the context and finish the cleanup.