Initial commit
Add additional commands when available
Resolved merge conflicts