07. Adding in the rest of the functionality

Complete and Continue