Add touch-ups here and there and add flow charts at the end