Separating component

Does what I was actually wanting to do in #3.