Refactored Goal tracking
parsing bookings out as objects