Completed command blocks

Closes #4