Alarson/unify component requests

Sidekick: @jstenhouse