ugh i hate everything about this commit