Commit after first big overhaul.
Added Screens.
Have not yet added SQL version of EntityManager from Kris.