WIP - working on type tests, includes full integer handling