Initial commit, addressing db issues