Issue #429 completed. Tests not finished