Added group, cleaned up header file.