Got the main data object sorted out and working