Alpha release 2.5

Functionally working as desired.  Some optimizing needed.