Working on database initialization more

i think it's working, just wanted to commit again