Added a couple of type testing functions to TODO