Starting to reimplement ICAAM