Completed #8, and added skeleton file for #9