finished new Main and DataController