Finished S07 Functional but not fully done

@Khloud-Khalid