Added first part of assignment 7