merging ryan's stuff
merging ryan's stuff