Headway on adding timer & goal location/detection