Done parts 5 and 6