Initial commit
Merge
notes and lines, add note