WIP. Making progress.