Working version
Finished commenting