[WIP]  joindin-247 

Work in progress... attempting to resolve this issue https://joindin.jira.com/browse/JOINDIN-247

Will update as I go along.  Any interim feedback welcome.