Completed fourth user story; renamed things