Starting to extract build processing out into it's own class