Commenting WIP

by Bistrian IOSIP