Finished Assignment

Changes made to fulfil assignment.