Adding quick notes and filtering (not completed version)