Updated the todo knocking off the state-wise filtering functionality.