Renamed objects
More var renaming
Started to add mutable implmentation