Still a few more changes and others to work out.