move stuff into a table (thanks chylex!)