Updates to getData

Finished adding the switch statement for what functions to call.