Dev. checkpoint.
More implementation.