Updated to make the API class hold every so it becomes a single file class.