Assignment 1 and 2

This addresses issue 1 & 2