Works now with new typeclasses