Encapsulated. Todos:

- polygon mode to openglcontrol
- encapsulate gui (?)
Finished TODO from previous commit