Added items.
Temporarily removed things for merging.
Merged.