Added type check functions
Marked a todo as done