Minor and final skeleton code revision 4/9/14