Added extra checks and tidying up
First pass of TextInput binding working