Finished changes. Appears to work well, at the cost of a significant loss of performance.