yet another rewrite

yay