Rebuild Artemis and Apollo

WIP