Updated Carpenter's Blocks

Closes #22