WIP Major reworking of binding. Not finished.