Newdev ryan

I'd like to merge Ryan's stuff