Version 4 11/7/14

Added some testing...
Still needs debugging and troubleshooting