Made a bit more progress but not there yet