Added some more commenting