Getting close to API/web restructure.