Added the rest of Lab 7