Second commit add base class