More api work
Totally needed :P
Can't even remember what I was doing here XD