even more progress directly on master