refactored some of the singleton stuff and added combinations of trending data

next step is to refactor the storage/trending data and work on settings