Event 58

Are these TODOs done yet? :)