Complete First Version

This is a complete version of the code, tested extensively on sphNG data from a variety of users