Work on add and remove functionality
Add some more blocking files