[WIP] CS-4726 - New Installer design