Building the initial data is now done in its own method