First pass at 'add filter/hook' abstractions
Use the correct class and file name
Careless coding