Adding in Atomic and Composite goals