Version 3 Overhaul

Clean up code, Removed test media