add tokenisation and annotation
alter tokens to use underscores rather than hyphens, node doesnt like hyphentated keys