Logic errors.
New class and ripped out old broken logic.
More moving around.