Added more states for phase 1 and started phase 2. Also added TODOs and comments.