Updated with more of the walkthrough