Working before the demo.

May be revert if something fucks up.