new updated source files.  50% working