MEF added to track problems, Problm 5 & 6 completed