this semi-works

Signed-off-by: Andrew Tselischev <andrewtselischev@gmail.com>