Moved around methods, to avoid certain static methods.

Also added a turn counter.