late night progress on masonry, pulled new version of sfun