minor refactor + substates, handling countdown and drawing next shape