Infinite agenda WIP

Changes range a bit but does not make a lof of sense yet :)