Experimental

Merging the two branches. (done manually, instead of relying on GitHub)