Updating class project, almost done!