Feature/building map

This is here just for you to look at and/or comment on. Maybe you can see something that would be causing these issues. @terrellt 
Unrelated, and no migration?