Refactored files, made a datasource. Still doesn't show up in UI.