WIP - type checks