WIP - Fixing data issues.