Work on exporting stuff, revert some changes for better diff