Need to fix trap/exit stmt