Trying to fix whatever I screwed up
Managed to miss commiting updated DatabaseAccess
Merge origin/master