added initial form and first hacks