Wrapped up my work on this for now.