- added filtering!
- cleanup
- docs