de-semicolonized
ready to start re-activating test code