Implemented rudimentary modularisation, and subsequently added in Clicky support.