Begin to resolve #36