almost done now @8