Added notes
Merge branch 'feature/notes' into dev