update from last time
Working on linking more forms, as well as UserDataBase
Merge branch 'master' into Jordan