Got rid of Diddy framework because it's got some wierd naming collisions with Mojo.