Changes to the Chart model - additional properties added and items moved to reduce repeated code.

Castle windsor stuff added to deal with which service to use.