#TODO Update to the fact that this only has athena stuff now
#TODO Update tests to check that there's only athena stuff