Removed dependency upon dict; this now allows us to enforce the attributes; plus simplifies the code. It appears to be working as expected now. Time for a break, then re-integration.