final version

added stuff from assignment page