Integrate with master

Added animation and drawing to play state