Finished basic features and several optionals