Add proper fields to users and add is_active to songs
All tests pass