Work in progress

Signed-off-by: Marko Dumic <marko.dumic@gmail.com>