90% there, just filtering to do.