Old code branch called original now, new striped code still needs work