Updated: Skeleton (Before Testing)