Amp refactor (WiP)