Fixed Parser
Added basic commerce