Mild restructure, add some task sheets, and do some more unit 6