integration more of daves stuff