Added skeleton functions for some new user commands, moved some commands around.