Checkin stuff for Issue #37