Cut down on todos, broke up data module