moving where_active_dates() to a custom ORM class

and changing all models to extend this class
adding a basic version of additional charges