Adding early Options, removing ContT.