masonry added, tidying up sctructure, testing and tweaking