added Athena's and my files to Ariel's solution