Next version, started a complete rewrite