Cleaning Implementation

Running more of the implementation via castle windsor.  Enabled more
logging.  General cleaning and refactor of solution