WOW lot done here but got a question now

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