Made changes to further work
Merged and updated future work