Add some ToDos
Create method for extracting files