Remove TODO, to get the app to work you need to reboot the device after the app is first run, so it can properly find the database.  Weird issue.
Refactoring classes for better maintainability