Progress on boolean. #25