added a whole bunch of features
features