WIP

Aiming for a July 2019 submission.