Added milestone-2 submission details
Refactored models and expanded parsing. First test passes