Starting work on type management.