Fixed final line issue; restored previous capability w/more modularized being commented out for testing, etc