start making it skeleton code
it's ready to work on
update notes
fixed merge conflicts