Finish up Ticket refactors