Major re-factoring, needs a monthly test.