WIP of rewriting.
Parse comment section into map.