Added in complex object component toggle and component metadata.
Fixed merge conflicts.
Added in complex object component toggle and component metadata.

Also, fixed merge conlicts associated with that.