Started new implementation.
Resolved old issues.