Rebased my steve tinkering code