Objects fixed!

-Objects oriented the right way