ok time to start breaking this
Fixed keyboard and removed uneeded calls to shim at state change
Found unnecessary call to show keyboard