slight refactor on command syntax and start of functions to take that into account