Multiple data sources

Refactor code so that it is able to pull data from multiple sources. Need to research where to get the information from though.