* Cleaned up source, preparing to convert into static library