WIP - added apollo, refined several things