Put roles into their own table.
Clean up