Significant work done to APIService. Haven't tested yet.