All tests passing, transvestigator appears to work, need to look at it more in depth before merge with master