More work from machine 2
Final commit