Completed first two methods, written tests