Abstracted database stuff
from presentation stuff.
Cleanup