Major changes, algorithm revamp. Now moving to set/use template framework