Improved

Rust architecture work begins