I think you may be right, but let's trim away at that sort of thing after the rest in where we want it?

In other words, with it fully working, we can drop what we think may be extra, one thing at a time and test each.  All before merging this ...