More Options for Trainers, Please!

I am a dog trainer that also provides pet care services to my clients. I have been looking for a new booking software and LOVE Scritches, however, it doesn’t have what I need yet.
-I’d love to see a package option (training package, where clients pre-pay for a bundle of services and have credits they can use on private lessons, consultations, whatever is included in that package)

-Add-Ons, so clients can add training sessions to their dogs’ boarding stay, or a bath and nail trim, etc.

-Specific booking times for services instead of blocks (maybe I am missing something and you do offer this- I’m still exploring!)

-Two different windows of time to choose for arrival and departure with boarding/overnight stays (ex. 7am-10am OR 4pm-6pm)

-Group classes option where multiple clients book a time slot. Could also be used for group walks, meetups, etc.