Initial import of assignment 2