Moving towards better use of event dispatch
Save/Load database
Merge remote-tracking branch 'origin/master'