Migrate esk and pass preliminary tests