great refactor

now with keyspace
now with text tagging