Notes work - Fixed #4