Made some slight changes to allow for an installer, will push that seperately.