Stop leaving files open everywhere
wip