major changes... still working on the filtering and active drawering