Beginning goal creation
Merge conflict