Much fixing! More implementations!