Dev. checkpoint: Touchup.