Revert 3b5bdf2..053c0c9

This rolls back to commit 3b5bdf2dacba2e798a3f4165b91a6ed970a20175.
First stable

This is far from perfect but you get the point ;)