Starting on the infrastructure for the make flag