All parts of the /api interface basically now working