Move inner class outside class
Add concrete implementations to PeachSubmitMain