This commit does not change behavior. It just adds new skeleton classes that don't do anything and aren't instantiated yet.