Assignment 7 WIP