Added a whole load of features/options