Updates to type system.
Working on type system.