Finished adding forall support