Milestones

Baby milestones.
Would https://gist.github.com/b73f2853a921b167f45a work? Then we implement the new state type once it becomes available. We might hit edge cases with this implementation.