appears to be working.
cleaned up junk vars and comments, have to change formatting still
conformed formatting