More work on the new completion process. Fixed #55