Added info, commented out stuff