Not positive I had sent this to git after finished... plus corrected a few things