Work in progress - added database structure
Work in progress