complete initial oop2 work

now I just need to get everything working...