attempting to make build a little less hacky
attempting to make build a little less hacky