WIP. Changes for review.