Assignment 8 - Updating my final to actually include everything I've added