More notes
Trying to close the loop on all the functions, lotsa untested code