initial commit
got db connection working
secondary commit will continue work tomorrow
fixed conflict