Attempt to move UIUC filter into its own module + bug fixes