temporary commit - doesn't even compile
Moved delimiters to configuration