WIP: Full AIMS2 review

Closed Daniel Juarez requested to merge full_review into master

Merge request reports