WIP cont'd.