Moved originaldatarequest into mapping function so data can be passed, removed unused functions, worked through some todos