redpony refactor TER