vs 3.1 stable release

ok, this is where it now works and I'm going to try not to break it