Pre-Alpha 0.1.0.0 Build 2

That last commit message about silly mistakes pales in comparision to
this one.
Only working for devs. Not usable.
Fixed another conflict.