move stuff around, timestamps, templatetag for timestamps