Work part 2 (8/46)

Work part 2