Implements and closes #8