Add some comments
WIP