adding tokenization capabilties. Need to add partial key matches later
adding new tagcloud support