Lots of build tweaking and changes to get a proper workflow in place