Added listing and deleting functions
Changed exporting
Main Fixed