removing davepatcher; gonna redo this