2.3

Made things a mess, but cleaned up a lot too. Monster are now classes!
ADDED TODO TO