Merge pull request #83 from TeoTwawki/ACP-only

More ACP work done.