1.0 feature parity + tests