David dev

this is a pull of my most recent work