Working to Merge end of day code

[robertwinkelmann]

end of day code for rdb to be merged into the finspace dev branch. Changes from Niall along with changes to align with code review