Updates on api handling shit