New binding routine seems to work now, testing needed