merge in contents of plato branch