Removed code in favor of a total from-scratch re-implementation -- Original approach was poorly done and past the point of no return