removed goal and track. Rescoping to MVP