Work in progress

Signed-off-by: bmomcilov <bojan.momcilov@yandex.com>