Reworked install process