Updated functions and added scripts to pull out features based on train/test split