Comments + error checking for REST