Finally finished... everything works!
Trying to finish merging this branch with Master
Merge pull request #1 from TheLyndonRay/origin/solaris

Origin/solaris