First stab at converting to ACE templates