removed underscore dependency
should probably run the tests and that - left one bind in place of proxy
null checks were not right. Need to check for undefined