organization into categories + adding some more