using new tk2d stuff, redid a lot of the crap