Project #6: Design Comprehensive

• Revised Comprehensive #1
• Revised Comprehensive #2