Refactored; partially updated graphing to use new filter system