brought hypothetical serval functionality back in. testable today from what I hear.