Implemented extra taso 3 without using a join table. Refactored some code.
---- Has a bug deleting files that I have to fix yet ----