Integrate Herminio's model mapping.
Update requirements.txt to include Flask
Updated model mapping
Update parser
Merge branch 'enhancement-#3' into develop