Fixed a few encapsulation issues
Also reverted the NEXTTURN enum to SUCCESS