Removing TODOs
Correcting ordering
Added pass-through for objectMode and everything is working =_=