#22 Created user interface similar to CIS