attempted to optimize code, but project is broken; sending this commit out to another branch before resetting to previous commit on master