Work on abstracting code in the installer library