:+1: 
This will be done separately and should address this and other comments around these objects.