Full pipeline in place. Now just fixing features