added inital goals and first iteration
fix conflict