finished temp oo code
changes