Updates to support when_ready... still borked though :/