Simplified database structure, began work on interface