interim non-working commit
Implement some corrections