Second version

Included data cleanup and some autopopulation