No Longer Needed. Separate Branch "Solaris"