WIP ENH: Adding forward code