Moved skeleton into its own class