reworked a lot of code so that I could push some sort of windows release out