Started note creation (broken commit oh no halp)
merge conflict