More additions to assignment 2.