Ugh... somehow committed partial implementations.