Scaffolding improvements, creation of goals scaffold
Added Goals