Started adding comments and errors