Greatly improved file parsing and creation.