I had been waiting for some more feedback on my approach. At this stage it looks like I will need to make some changed and push the component packing...