Adding 7 and progress on 8