Partial solution for files app