Continued updates.
Moving in the right direction.