Continuing to work through 1 & 2