cleaned up fixed errors
switched to oo setup; working