Not sure I've made much progress since the last commit, but it's an update.