Add stuff from assignment 3.