Dev cmdprompt

Not sure if it's okay to include all that other stuff? I could rebase it to be 2 commits.