Added CSV Compatibility

Still need to fix market link