checking in for w2olabs code review