Notes are now awesome.
Merging