Finished CH7
Add includes