MAJOR bug fix
Merging. Sorry. Will remove trash if needed.

Conflicts:
	Constants.h