Notes

This is the first commit after the revert.