Finishing up initial set of features