this goes to ryans branch only, not master

this goes to ryans branch only, not master