Issue details

Part 2 - responsibility for functions