Almost there, but many more changes to come