Removed legacy code, included dif checker, all around bettererer