Started on goal system.
Merge