Rework REST api so that it validates spot stuff better