Basic API complete - Testing remaining - Currently buggy