Starting mapping - moved dashboard into seperate files