Started splitting spec and body.