Merged database and interface
MERGING DATABASE AND GUI
commiting shiz