Finish up getting all specs to pass for #6