Refactoring
Clean Up & Documentation
Test: Add Listing
Refactoring
Core: Improved Error (Shutdown)