Almost done

Signed-off-by: skrech <skrechy@gmail.com>