Resolve issues numbers 1, 2, 3, and 5