Tidying up Windows (PS) version.
Started implementation proper of *nix version.