WIP: re-writing input