Revert "done some stuff (untested)"

This reverts commit bedcc35bdbb6727a388f830b886e8103cc9e76ad.
Stuff...