Cleaned up code, working on the benchmarking and by great Zeus's holy beard this is going to take longer to get done than we can imagine...