@arschles this still in progress? if not, let's cleanup the comments here and above.