lots of changes. I'm sorry for a terrible commit
removing future timeline