Attempt at masonry. Added in extended search.