Building re-write
more work