not done with notes but they're on their way
Completing merge