Chop it up to get it to run in CF. Borks tests
Fix testing setup
Fix merge issues