WIP - in-progress markup/semantics