Cleaned up playable code - moved to own branch