Bugs and Maps

Maps in progress