starting working on goal view refactor