Refactored how notes are being handled...