wheeee, more todo squashing and tests