Initial changes

Ran 1498 tests in 2002.525s

FAILED (failures=313)