BookingsForm refactors but not working yet