Committing ryan's changes. it ran sorta funky but worked.