api mostly working now too??