chiark / gitweb /
start effort to split out common entities