Tonights work on ACG

See commits