Initial commit

Forgot the defer here.