Bug commit of loads of stuff