Added new file that should have been included in previous merge from feature/ui-enhancements branch