0.8.0 - a small rewrite