Reworked 98% of the logic for ACM - better doc-blocks & many other updates