move stuff around
updates from tutorial and learning more about parsing