Feature branch: toggle instead of removal

* unit tests for each new function
* deleted functions not in use for this branch
Test page.