Adding in skeleton code rewrite