Initial work toward install overhaul