Updating Todo, cleaning up athena.js