Issue 88, 89 and 18 partial