WIP: more tests and add option to toggle box