Working typeclass version

* Other one got borked during the refactor. Should be running the test file more often :)
Merge branch 'master' into experiment