Work on refactored install process