So, this is a big class with big methods. Would be worth pondering if there is something else around conceptually to compose functionality in.