added Jon's skeleton code
merged