Issue #47:
Trying to remove the NoteProperty
Restructure the code.