first working but not tested version, lets move it now