API mostly working