Added goal setting
Resolved conflicts