Started work on type checking