More development on the installer (broken)

Continued improvements to the installer, including removing the goto statements, still broken though