Updating to enable toggle library.
Adding callback and wish action preservation