Changed my mind about having them in separate classes