Got rid of Wrapper. Life became easier and simpler. Hiding times are now the Listener job which seems to be reasonable.
minor
merge unwrap branch