Reimplementing old functionality. Doesn't compile.
Old functionality works complely, tests pass.