Redesigned code, functionally complete.