Somewhat major refactor, to make use of ACME