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 pull request #6 from FearsomeFoursome/SY-Branch

Merge all branches to master again
MERGE EVERYTHING RAAAR
Merge pull request #11 from FearsomeFoursome/master

Rebranch after merge again