More work on Sprite, starting work on Entity system