Finishing my new configuration setup - it was faux code before, this should all actually work