Reworked more of the code.  Made more changes to make code work right