allmost done

Signed-off-by: ofrioster <ofrioster@gmail.com>