Added a basic skeleton for #2