Wes's Notes Patch

Working quickly here, but a quick test suggests that this is ready for inclusion