Feature/storm 5775 squash1

PLEASEREVIEW @declanshanaghy @ledio This is a rebase/squash branch of #1