Complete rewrite of Post Installation Script