Add better file handling and new builtin (#then)