Loads of work to get it running right again