Refractored the **** outta that project for future material work