Moving Alpha Branch to Master

Code id now in a stable spot to now add enhancements and work out the last few bugs.