Added in a lot of ps1 changes so my command line is purty