Continuing work on components; looking for a simpler solution for now.