Refactor dbMap
Comment out account shit for now
Add user account - buggy