Merge pull request #3 from FearsomeFoursome/master

Rebranch after merge
renamed a few object classes, started some object-handling logic
object classes reworked
object classes reworked
MERGE EVERYTHING RAAAR