almost done! big advance...