attempting to make build a little less hacky