trying out the new branch

i'd like to merge notes