Object oriented

wow, it's now object oriented!!