Refactor installs to make ADDs further down