Made api a little simpler (maybe?)