Got part 2a working