Notes implemented and tested