Added comments (WIP)