Extensive work done on the database set up and query. Added 2 new
packages to aid in separation of concerns.
Merge branch 'work'