Added comments and junk