Lots of progress, finally where I was meant to be a week ago