Back tests to green
Refactor all to support References