somewhat cleaner, still mildly stumped on the hundreds place
bullshit commit to remove a couple of failing tests