Modification 2

More functionality accomplished