Squashed commit of all the work