Worked on the 1st part of the roadmap

@rprieto let me know what you think!