Update rcheetham w/ recent updates