Implement todo-prio, switch format and refactor