Updated commenting and added extra basic functionality