finished refactoring parser and country model, uses numpy for interpolation now