this works, but is the worst commit