[WIP] comments done