Add score tracking
Move to a single render method