not great, and the toolkit needs some migration, but working enough to tackle other problems with it; fixes #149