map is hooked up to database now
fixed merge conflicts