Some rearrangement and som TODO secctions