some progress, to be redone

Signed-off-by: zeljko <zeljko@zwr.fi>