First pass at moving make logic into its own class