Made a start on Michelles changes