Make it extend

Added a filter and stuff.