Finished initial modifications..  This satisfies the lab requirements.  It isn't as flexible as it could be, but....