Completed first round of implementation.