Added artoo and its gems
Clean up