managed to squash a null pointer i introduced with my second to last commit