3rd commit -almost done