Initial AE commit w/ comps