Some comments added - WIP