Got part 2 working