Cleaning up abstractions && Trying to localize CSV stuff