Reworked logic to handle variances in different data sources.
TODO: Remove old code (lots to be removed), add views for the new models for interactive purposes.