Completing first phase of #18