Mmhh... added commands. Whacky bug with PEM in linux
Some refactoring