First working draft. Note temporary new test file test_new.py