Phase 1 complete. Results in Masonry, Maps added, cleaned code