Kjq/addonetouch

PR in progress; please don't merge yet.