Adding in better comments stuff