blah
working on 2d support more, also tracking down a bug