formatting
acme: add initial work on tags, moving things around.