Picking out many bugs after transition to a more OO approach 
(still getting ready to split the windows!)