Nearly submitted

Before adding some more comments into the code