Type-Checking, Finish Initial Implementation