Feature/acp

Please remove these globals.