* Moved notes stuff into right block