WIP to address djf's review comments