Started on captions
added Today
Added counter support and more primitives