My idea was to leave component.html untouched as that is the unit page's rendering and I wanted to be sure not to break it. As soon as the unit page is replaced, we can remove component.html too. If you'd like me to try to share the logic I can, but it may be subtly different. I'll have to investigate.