work from Team 2
fixing merge from master
added notes and finished team2 work