Skeleton for Issue #25