FR#2 – Add support for deadlines

History