Started working on API class
Added API-friendly methods
What did I even change here?