made more mvc-ish and started work on filters