started assignment 5 + minor changes to assigment 4