Hmmm made some changes

Still not sure how to piece it all together.... need to think of some
clever way