Added files and about to change sets to frozensets
Custom add working
Refactored to use .startswith()