Added all features

Need to Debug