Add a more "proper" entrypoint with fuller parser

Add a more "proper" entrypoint with fuller parser #216