Input files + TODO added