Going to spend this morning getting torch-sim to conform to more types. I'll hopefully have all the PRs up by the end of this week!