WIP

Solaris will be right back