Incomplete updates for witch

Currently witch faces some implementation issues; this includes some
work on implementing it.