Adding more stuff to roadmap that's been sitting in my head