Design overhaul. Changed names of stop objects