Reorganized, Working on hover