cleaned up code, and is now turn based