Updating codebase to match end result of Workshop 5.