Ok almost done