reorganize by type
this should be an motd