Code done, comments added