Features almost done?

Signed-off-by: jayrambhia <jayrambhia777@gmail.com>