allmost done

Signed-off-by: Beni Lev <beniloew@gmail.com>