Final Update

Added all the features