Adds some stuff.
Merges with changes from work.