Removed Volume Use Cases and made a few changes.

Still working.