Starting work on api changes; aiming to centralise value creation logic.