Menu and error checking

Completed the work for Class 7.