Morning Commit

Mostly from the Listing of API on the Master Controller