I've made some progress

Two steps forwards, 30 steps back for style.