Merging 2 feature engineering branches to allow combination of the code

[JackDI1]

The aim is that once these have been merged, we can then combine all of the features and create a full feature set.