Add initial work on database layer
Whitespace fix.