new cargo.toml
merge
Dev stuff
more generics