Rewrite spec, add first TODO