database stuff
merge changes to this branch from github