wip commit of lorc changes - doesn't compile