Fixes #30 (again), removed support for athlete_id=None since that doesn't work here; moved code block to a better place in class.