Added comments
WIP