Commit for part 2 of the artemis demo