blarg, bug fixed, but sitll brok