commit that makes this pretty unusable for anyone but me, sorry, need to refactor at some point.