Completely redone. No more waco code, all new. 2nd line!