Dev

merging john's stuff