Mars problem logic done. Need to add tests
Some moving around of classes
Some minor changes
Adding tests for extractor
All tests done