Have slowly been going through implementing functions as per lesson 30 of lcthw
Fixed conflict