wip better markup