Reogranization of code. Discovery of weird bug.