Ported all two table API functions, woo