Added handling for command blocks
Added preventions for conflicting commands