Implemented  more commands, require testing