move some stuff around, work on events-as-posts aswell