Add togglelist
Cleanup
cleanup
Major update