Mostly organized, starting to debug DB interface
Mostly reorganized, starting to debug DB interface