updated the structure of thangs, making this a little closer to ill