Improved reflection, so testing/quick works now.