Additional work adding a slew of features