Revamp

Moved data into data access objects for easier and more modern handling.