Preliminary code
Let the fight... BEGIN!
Zoom--POW!!
Merge branch 'master' into secretfeature
ShaZAM!
WHAP!
Got the model to work right, so yay. Will now fix the entity code.
Whoosh!
Ka-Pow!
Don't mind me...
just solving other people's problems.
Lolz, merge fail