Works against public API now. Cleanup and further testing needed only now.