Work on typesystem some more