renamed a few object classes, started some object-handling logic