Reverting to the last working commit (reverting 2 commits).

Revert "-_- that was supposed to be a move"

This reverts commit 07f35f523dc6fa16d23d362b246a0b1e9c346cfd.

Revert "buggy... DAMMIT ALAN"

This reverts commit 1f2540cdb927988e58f4df1f35336a2f2c9713e1.