Major refactor to shore up foundations / data testing