Commented about half of the file, will do more later
Added some todos based on commenting file