Added some basic commenting