Implement next few features, including custom delimiters