touches
update
updates
stylin and profilin
chad almost blew it
resolved conflict