introduction stuff
more introductions
merge conflict fixed