Refactored into different files. Can 'complete' and remove notes.