Assignment 2, initial commit with code copied from ass1