Stage and Player refactoring

I like to say refactor. Slowly struggling towards a main event loop.