Even more work on Types