Starting from scratch with better module encapsulation
Put old code in another file, hard to think with all that other code hanging around.