#66 and partial resolution to constructor completion