cleaned the code up and got it in a much better state.