Parsing fix, relegated demo to separate project.