A shameful commit (failing DRY) but I want this in github before I leave for the day.