Initial version
Revert ""

This reverts commit 388d281f9e0da7d16f1f763fe18f570c7933fb4d.
Initial version
Before hacks from Frank