Rewrite to be totally safe
0.1.0