Straight forward

Smarter data import and data management.