OO work

Various Changes through time