WIP: reorganize slightly