Ch1 complete, Ch3 edits done