clean up of the odd model, lots of public, lots of unused methods. trying to also confirm to c# standards