massive commit - almost done