Work in progress
Work in progress - added database structure