US3: First complete implementation.
US3: Cleanup refaktoring.