Implement the API, the way I think it should be, 100% coverage is coming